Skip to content

Support configurable forge-loop base branch#160

Merged
hadamrd merged 3 commits into
trunkfrom
feat/codex-agent-provider
May 30, 2026
Merged

Support configurable forge-loop base branch#160
hadamrd merged 3 commits into
trunkfrom
feat/codex-agent-provider

Conversation

@hadamrd
Copy link
Copy Markdown
Owner

@hadamrd hadamrd commented May 29, 2026

Summary

Adds a configurable repository base branch so forge-loop can operate on repos whose default integration branch is not trunk.

Why

Pulsar uses main. The runner was hardcoded to fetch and create worktrees from origin/trunk, so every worker failed before doing useful work with fatal invalid reference origin/trunk. This should be a manifest/env setting, not a runner constant.

Changes

  • Add repo.base_branch to config, defaulting to trunk for existing users.
  • Add LOOP_BASE_BRANCH env override.
  • Thread the setting through worker dispatch, pipeline dispatch, boot dispatch, MCP worker dispatch, and doctor/config output.
  • Update worker worktree preparation to fetch and base from origin/<base_branch>.
  • Add config tests for YAML and env override.

Verification

  • uv run --frozen pytest tests/test_config.py tests/test_worker.py
  • Pulsar wrapper now reports code matches origin/main and can create loop worktrees from origin/main.

MAJDOUB Khalid added 3 commits May 28, 2026 00:59
Add repo.base_branch and LOOP_BASE_BRANCH so worker worktrees and doctor checks can target repositories that use main instead of trunk. Thread the setting through worker dispatch paths and cover yaml/env loading.
@hadamrd hadamrd merged commit 871f29d into trunk May 30, 2026
2 checks passed
@hadamrd hadamrd deleted the feat/codex-agent-provider branch May 30, 2026 00:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant